diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-05-28 21:00:05 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-05-28 21:05:55 +0200 |
| commit | 9950a388d23b69cd86bed5306a0c6b99d7c751cb (patch) | |
| tree | ec088ab0afd351019c2748dda74f6cc731330c40 | |
| parent | Merge pull request #10475 from ameerj/microprofile-workaround (diff) | |
| download | yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar.gz yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar.bz2 yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar.lz yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar.xz yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.tar.zst yuzu-9950a388d23b69cd86bed5306a0c6b99d7c751cb.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | externals/vcpkg | 0 | ||||
| -rw-r--r-- | src/common/bit_field.h | 5 | ||||
| -rw-r--r-- | vcpkg.json | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7276ac9dd..7e8f35a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(Boost 1.79.0 REQUIRED context) find_package(enet 1.3 MODULE) -find_package(fmt 9 REQUIRED) +find_package(fmt 10 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) find_package(LLVM MODULE COMPONENTS Demangle) find_package(lz4 REQUIRED) diff --git a/externals/vcpkg b/externals/vcpkg -Subproject a7b6122f6b6504d16d96117336a056269357993 +Subproject 656fcc6ab2b05c6d999b7eaca717027ac3738f7 diff --git a/src/common/bit_field.h b/src/common/bit_field.h index e4e58ea45..0168ff9cb 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -188,3 +188,8 @@ private: template <std::size_t Position, std::size_t Bits, typename T> using BitFieldBE = BitField<Position, Bits, T, BETag>; + +template <std::size_t Position, std::size_t Bits, typename T, typename EndianTag = LETag> +inline auto format_as(BitField<Position, Bits, T, EndianTag> bitfield) { + return bitfield.Value(); +} diff --git a/vcpkg.json b/vcpkg.json index 19f99e89e..26f545c6c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", + "builtin-baseline": "656fcc6ab2b05c6d999b7eaca717027ac3738f71", "version": "1.0", "dependencies": [ "boost-algorithm", @@ -53,7 +53,7 @@ }, { "name": "fmt", - "version": "9.0.0" + "version": "10.0.0" } ] } |